[IA64] Slightly modify xen memory map to make room for IO space.

Signed-off-by: Tristan Gingold <tgingold@free.fr>

diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
index fecb8562ee8e295feebc4f968c13f3d410a7d0ac..3cc7557dddcbe84ff9cbec7e671e42b55ada6785 100644 (file)
--- a/xen/arch/ia64/Makefile
+++ b/xen/arch/ia64/Makefile
@@ -60,7 +60,7 @@ $(BASEDIR)/include/asm-ia64/.offsets.h.stamp:
         || ln -sf $(BASEDIR)/include/asm-ia64/linux $(BASEDIR)/include/asm-ia64/xen
 
 # I'm sure a Makefile wizard would know a better way to do this
-xen.lds.s: xen/xen.lds.S
+xen.lds.s: xen/xen.lds.S $(HDRS)
        $(CC) -E $(CPPFLAGS) -P -DXEN $(AFLAGS) \
                -o xen.lds.s xen/xen.lds.S
 

diff --git a/xen/include/asm-ia64/xensystem.h b/xen/include/asm-ia64/xensystem.h
index 95a1991e1a0b58f7fcff76755b3329ae4db13062..9fd8e5bb0dec3641650aaa92c1c7c5a5c008c167 100644 (file)
--- a/xen/include/asm-ia64/xensystem.h
+++ b/xen/include/asm-ia64/xensystem.h
@@ -19,11 +19,11 @@
 #define HYPERVISOR_VIRT_START   0xe800000000000000
 #define KERNEL_START            0xf000000004000000
 #define GATE_ADDR              KERNEL_START
-#define DEFAULT_SHAREDINFO_ADDR         0xf100000000000000
+#define DEFAULT_SHAREDINFO_ADDR         0xf500000000000000
 #define PERCPU_ADDR             (DEFAULT_SHAREDINFO_ADDR - PERCPU_PAGE_SIZE)
 #ifdef CONFIG_VIRTUAL_FRAME_TABLE
-#define VIRT_FRAME_TABLE_ADDR   0xf300000000000000
-#define VIRT_FRAME_TABLE_END    0xf400000000000000
+#define VIRT_FRAME_TABLE_ADDR   0xf600000000000000
+#define VIRT_FRAME_TABLE_END    0xf700000000000000
 #endif
 #define HYPERVISOR_VIRT_END     0xf800000000000000